Remove GtkArg, GtkCallbackMarshal and GtkFunction

Based on a patch by Javier Jardón.

https://bugzilla.gnome.org/show_bug.cgi?id=629955

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index b5b947e135b43b85be61d7e08422befea8b11e9a..9b565514b86a3efab5c65c3916fae50c34dc0da1 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -5316,11 +5316,6 @@ gtk_grab_remove
 gtk_device_grab_add
 gtk_device_grab_remove
 
-<SUBSECTION>
-GtkFunction
-GtkCallbackMarshal
-GtkArg
-
 <SUBSECTION>
 GTK_PRIORITY_RESIZE
 

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 15c749d512428336ef339e86cb94a9c90fb48753..91ef2178c96918195e1551693331f5ec1637b872 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -41,86 +41,6 @@ G_BEGIN_DECLS
 #define GTK_TYPE_IDENTIFIER (gtk_identifier_get_type ())
 GType gtk_identifier_get_type (void) G_GNUC_CONST;
 
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-/* --- typedefs --- */
-/* here we come with some necessary forward declarations for structures and
- * provide some fundamental function signatures
- */
-typedef struct _GtkArg              GtkArg;
-
-/**
- * GtkFunction:
- * @data: #gpointer
- *
- * Defines a function pointer.
- *
- * Returns: #gint
- *
- * Deprecated: 2.24: Use GSourceFunc() instead.
- */
-typedef gboolean (*GtkFunction)            (gpointer      data);
-
-/**
- * GtkCallbackMarshal:
- * @object: #GObject*
- * @data: #gpointer
- * @n_args: #guint
- * @args: #GtkArg*
- *
- * Defines a function pointer.
- *
- * Deprecated: 2.24:
- */
-typedef void (*GtkCallbackMarshal)  (GObject      *object,
-                                    gpointer      data,
-                                    guint         n_args,
-                                    GtkArg       *args);
-
-/**
- * GtkArg:
- *
- * This is a structure that we use to pass in typed values (and names).
- *
- * Deprecated: 2.2:
- */
-struct _GtkArg
-{
-  GType type;
-  gchar *name;
-
-  /* this union only defines the required storage types for
-   * the possibile values, thus there is no gint enum_data field,
-   * because that would just be a mere alias for gint int_data.
-   * use the GTK_VALUE_*() and GTK_RETLOC_*() macros to access
-   * the discrete memebers.
-   */
-  union {
-    /* flat values */
-    gchar char_data;
-    guchar uchar_data;
-    gboolean bool_data;
-    gint int_data;
-    guint uint_data;
-    glong long_data;
-    gulong ulong_data;
-    gfloat float_data;
-    gdouble double_data;
-    gchar *string_data;
-    GObject *object_data;
-    gpointer pointer_data;
-
-    /* structured values */
-    struct {
-      GCallback f;
-      gpointer d;
-    } signal_data;
-  } d;
-};
-#endif /* GTK_DISABLE_DEPRECATED */
-
-/* This used to be defined in gtkitemfactory.h, but moved over here after
- * the complete deprecation of that header
- */
 typedef gchar * (*GtkTranslateFunc) (const gchar  *path,
                                      gpointer      func_data);